From 6312e404761e82f82bba3bcddd0c89dae81e86d4 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Fri, 21 Oct 2011 16:54:25 +0000 Subject: [PATCH] * Call Linker methods statically * Removed now-useless parameter RevisionDeleter::getLogLinks(), updated the only caller --- includes/LogEventsList.php | 2 +- includes/revisiondelete/RevisionDeleter.php | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index ca0aac1aa0..f387320696 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -466,7 +466,7 @@ class LogEventsList { // If an edit was hidden from a page give a review link to the history } elseif( self::typeAction( $row, array( 'delete', 'suppress' ), 'revision', 'deletedhistory' ) ) { $revert = RevisionDeleter::getLogLinks( $title, $paramArray, - $this->skin, $this->message ); + $this->message ); // Hidden log items, give review link } elseif( self::typeAction( $row, array( 'delete', 'suppress' ), 'event', 'deletedhistory' ) ) { if( count($paramArray) >= 1 ) { diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php index 9f05c620d3..0c2197ac54 100644 --- a/includes/revisiondelete/RevisionDeleter.php +++ b/includes/revisiondelete/RevisionDeleter.php @@ -113,11 +113,10 @@ class RevisionDeleter { * * @param $title Title * @param $paramArray Array - * @param $skin Skin * @param $messages * @return String */ - public static function getLogLinks( $title, $paramArray, $skin, $messages ) { + public static function getLogLinks( $title, $paramArray, $messages ) { global $wgLang; if ( count( $paramArray ) >= 2 ) { @@ -132,19 +131,18 @@ class RevisionDeleter { if ( count( $Ids ) == 1 ) { // Live revision diffs... if ( in_array( $key, array( 'oldid', 'revision' ) ) ) { - $revert[] = $skin->link( + $revert[] = Linker::linkKnown( $title, $messages['diff'], array(), array( 'diff' => intval( $Ids[0] ), 'unhide' => 1 - ), - array( 'known', 'noclasses' ) + ) ); // Deleted revision diffs... } elseif ( in_array( $key, array( 'artimestamp','archive' ) ) ) { - $revert[] = $skin->link( + $revert[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Undelete' ), $messages['diff'], array(), @@ -152,14 +150,13 @@ class RevisionDeleter { 'target' => $title->getPrefixedDBKey(), 'diff' => 'prev', 'timestamp' => $Ids[0] - ), - array( 'known', 'noclasses' ) + ) ); } } // View/modify link... - $revert[] = $skin->link( + $revert[] = Linker::linkKnown( SpecialPage::getTitleFor( 'Revisiondelete' ), $messages['revdel-restore'], array(), @@ -167,8 +164,7 @@ class RevisionDeleter { 'target' => $title->getPrefixedText(), 'type' => $key, 'ids' => implode(',', $Ids), - ), - array( 'known', 'noclasses' ) + ) ); // Pipe links -- 2.20.1